Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Tue, 20 Feb 2007 09:34:22 +0000 (09:34 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Tue, 20 Feb 2007 09:34:22 +0000 (09:34 +0000)

Trivial merge